Fix a couple tile transitions in different situations
Fix some more transition issues