other registration fixes