Misc small tweaks/fixes