correct a couple of bugs inserted during API name changes