Few minor cleanups