More minitweaks