Fixing those tickets: CRAFTERCMS-65 CRAFTERCMS-74 CRAFTERCMS-62 CRAFTERCMS-44