Travis build failed #2 - more corrections

- This commit will also be squashed later