Hotfixes and Rest in progress