fixed analysis warnings