Fix some scrutinizer issues
Better code coverage