Improvements and fixes to variable check editor