Final Praux Tweaks, courtesy of RieCatNor