Bugfixes
Some issues with compilation now i think fixed