Added some missing variables