Address CA warning