Fix singleton variable warnings in the compiler