Fix compile-errors