Edgar fixes