Fixes to baseline configuration and travis test run