fixes in new infrastructure