Couple cleanups