Misc small fixes and changes.