Gulp fixes

This resolves #489
:+1: