Fix merge issues exposed by tutorials
Update documentation