simple hotfixes, fixing bugs