changes backported from old hostcreator