bug fixes, code tweaks for 2.4.5 compat