Scrutinizer fixes.
Travis fixes.