Fixed some minor issues from Scrutinizer