API registration fixes