General: Minor cleanups