Fix breaks in sapphire API