Req fixes/enhancements