Fix compatibility issues with RC5