Fix warnings about non-static variables