Fixed some compile errors.

Conflicts:
	bin/demo.js