Various cleanups.