Work towards fixing items