Fixed a couple of Scrutinizer issues
Added annotations