RBY Counter fixes