Bug fixes

On Kanbanery, it refers to the tasks descripted on:

#1017320
#1012630