Fixed collision and tile issues