Gulp fixes

This resolves #489