Small scheme updates