CRAFTERCMS-284, CRAFTERCMS-171 and CRAFTERCMS-172: Fixing those issues