Make oom check consistent, check and correct overlong payload size