Fixed some RequestHandler issues