Fix compile-errors in compiler