Removed "bugs" reported by Scrutinizer-CI