Fixing Resource bugs and moving the Request dep to a setter.