Fixed a few errors expecting variables to have values