Fixed compile-time errors