Internal tweaks for better testing