fixes from rb