FIXME: Fix check-api errors