Bug Fixes

- Entity Management bug fixes