[ci.o.o] small improvements for crowbar trackupstream