Fixing static var statements