NORMAL small bugfixes