Few updates to make it work again on the Grid