misc. bug fixes to improve pipelining stability