Further admin and super fixes.