Some collission fixes