Some additional cleanups