Fix static method and variables