Mini fixes

See separate commits for details