Some minor tunings