Closure compiler annotations and fixes