Some minor fixes
Merged with seif, ignored changes to application.js.