more Api fixes