small fixes (no gap if grid disabled)