Minor tweaks discovered in testing