More reset pipeline fixes