Fixed C3 compatibility issues