Various fixes for gulp