Various fixes

don't forget this one ;)