more mustache fixes