Misc changes and fixes.