Last updates before gulp overhaul