Fixed a few bugs from unset variables