Some tile collision fixes;