Fixed popping and other tile related issues