Fixed more collision bugs