Various issues from Scrutinizer