Fixing some stuff based on Travis and Scrutinizer feedback