Fixes in server combinators