Minor fixes

Just for review, don't merge yet...
What's our policy on single and double quotes in ERB?