Fixes
Specs + travis