Minor fixes, remove -x; still no idea why it fails travis.