Minor tweaks from initial testing