Small registration fixes