Fixes for 7-17 hotfixes