Fixes and travis