Fix static errors