Minor fixes

Eliminating some error messsages, mostly relating to not-yet-defined variables