Fixes as per PCG