Char: rio, fix cirrus defines