Ethan fixes