Fixed uninit vars