Updates to get it work for TG 2.3.0

Minor tweaks to get it working for TG2.3.0 minly around the admin
controller.