Fixing rest endpoint build failures