Add some tweaks for 8.1