Quick fixes

some quick fixes introduced with the latest PRs..