Closure compiler annotation fixes