Routine update. Minor cleanups.