Fixed remaining issues with Coordinate stuff.