more CustomAlloc fixes and tweaks