Fixes and travis test