Travis friendly fixes