More misc cleanups