Minor tweaks for testing