Fixes for Travis and building