Couple more E_STRICT fixes
Tagging 2.3.2 Beta 2