Fix static functions issues