fixes for registration