Fixed disposals and Fitzroy issues