A few simple changes after removing direct access to entities. Missed some bits where wrappers were still passing back immediatly from entitites.