Fix some scrutinizer problems