Fix some entity handling