Fixed more instances of trying to pass return value iin write context