Export registrations fix