Hopeful fixes