Misc sh5util cleanup