Minor mods based on Paul's feedback