Fix and merge errors