Fixed more initialization bugs