2.17 Hotfixes