Fixed some coordinate issues