review fixes for Evan