fixes for entity editing/creation