CRAFTERCMS-177 and CRAFTERCMS-159. Manage to fix those issues