Fixes for Registration