Update the repo from nursix
Fixed the remaining XLS errors