Fixes for closure compiler builds