small bugfixes -MAR