Misc fixes and changes.