Fixes to Entity when specifying an initial position by @tomzx