Tweaks to GMX engine