Fixing allocation problems