Fixing abort errors