Technical debt - fix SH deprecated warnings