Update dependencies, grid lap-up namespace fix