Organization fix for admin

Also hibernate proxy stuff