More option tweaking