Misc code changes.