A couple of changes for pre/post request hooks