Misc small fixes.