More fixes on coordinates