Bug fixes to allow Admin view inclusion