Various fixes

Maybe, but I don't know if this objectclass always exists (for overlay without options).