Fix several cases where the ring size is handled in the wrong units