fix cell stuff after recent patches