Hotfixes everywhere!