Small changes to PE6 and 31