Fixes for the failed travis build