Remove global variable warnings