Edition fixes