More HAML issues fixed.