jf-common fixups