Follow-up cleanups