Fixed init issue & NPEs