Pull in newest assistants with some fixes