Fix closure compiler annotations