Fix static typedef issues