Some collision bugs fixes