Minor updates for cleanup.