Fixes for mobile, Travis cleanup attempt