1.7.36.1

small bugfixes