Some fixes for intra item waiton