Fixes in case of OOM