A couple more cleanups