Develop jdj fixes for new hardware