Changes to support Brunch 1.6.7 (forgot to build before committing!)