fixes from fx