Fixes following review and Travis