Minor changes and cleanups