Scrutiizer/Travis Fixes.