More cleanups and adjustments