Small cleanups *squash*