Jf/utils improvements