Resolved some errors during last merge