request builder fixes