More cleanup, need to prevent change signals firing when we are saving the file ourselves