Fixes due to travis errors