Fix issues with editing CIB when using an external $EDITOR