Fix some warnings in templates/frontend.rb
Merge branch 'more_fixes'