Tweaks for Closure compiler