Bugfixes
Fixed compiler issues