No issue / scrutinizer fixes

Some fixes and sanitizing.