Fixed Smaller issues with GridMap