Fixes for mustacheifying