Fixed some unset vars