misc tweaks for testing