Small cleanups and adjustments