Fixes for Travis problems
Fix out of memory problems