auto-registration improvements