Admino core fixes

Opening up for initial review. More commits and description to follow.