Tiny fixes, admin commands