Fix X,Y in entities