Fix compile-time errors