BugFix: Fixed compiler errors