Changes to support Brunch 1.6.7