Fixes for registration