trivial fixes from fx