Minor fixes
Update core grid to v1.6