Welcomer hotfixes