1.2 bugfixes ported from devel