Misc fixes/changes.