Slight changes to admin functions