Minor changes to scheme mode