fixes in new infrastructure 3