Small cleanups and fixes.