Keep pointers in api/api.go consistent