various fixes reported by ruto