Fix some collabse bugs