Additional tweaks for internal purpose