more 1310 bugfixes