entity editing fixes