Fix static vars