Additional erb fixes