Fixes for Travis build