Fixes to make jnf-dev compile