Scrutinizer/Travix Fixes.