More bug fixes for high gens