Fixing some coordinate system errors