Fixed minor errors, including: removing unnecessary @override
annotations and adding type arguments where needed.