some anonymous fixes