From Per: fix erb warnings