Fix up EntityEditor - Still broken though