fixes in entity T4 generators