Fixes issues with travis build