Fixed minor import and variable warnings.