Further changes to fix travis build