Fixed a couple of bugs with Entity Options