Some more cleanups..