Cleanups, trying to get travis tests working