other fixes from sui