Resolved some Admin:: namespacing issues