Misc cleanups [ci skip]