Couple of minor cleanups