Bugfix miscellany