Tweaks for 1.8.7 and 1.9.2