Refactor/post pouch version minor fixes