oss fixes and cleanups.