scrutenizer fixes