Build system fixes

seemed to work then random death on travis