Small fix in request handlers