couple of quick bugfixes
Merge branch 'master' into version_2_9