Fix static issues