Hotfix: fix compiling

Also an attempt to fix my git problems