Fix some faulty world checks