More hacks to stop matrix disappearances