Minor cleanup + better dealign with oome