Fix some initialization..