A few more cleanups