Fixes Travis-CI and some style issues