Hotfixes
Patch to compile