Fixing bug when deleting a changelist with no p4 fixes
Improved variable handling