Fixing Edit bugs