Minor tweaks from live testing