Merging more fixes