Bug fixing required for integration testing with PCE.