OOM & misc : a few small fixes per 2.6.36