OAK-9718 - Fixing rat check failures