Fix some grid merging issues, bump beta