Improved OOME handling