SDK typo / map functions fix