Fixed some errors form not set vars