Couple more cleanups