Fix some entrance/instancing bugs.