Fixed some enemy/player collision issues