Travis/Scrutinizer Fixes.