Couple minor cleanups