Tweaks for my own use JFR