Fix bugs introduced when multiple generator types were added