Minor tweaks during testing