Fix static init mess