Yet more changes to try to nail the problem with full items