Re #485: Various changes