Small fixes for closure compiler