Fixed variable warnings