Fixing unset vars