fixes from rio