Fixes for travis only