RegistryCom440 Fixes