Fixed coordinates in some places