Stop grid fixes