Fix to allow closure compile pass

Minor fixes to allow closure compile
Merge pull request #25 from ghigo/master

Fix to allow closure compile pass