a couple of tweaks for testing