Couple of tiny cleanups