Some minor cleanups from the last commit