Minor tweaks from testing