Fix remaining compile-time errors