Virginia lawmakers OK Northam’s changes to marijuana bill