updates to work with latest upstream

they are in base.rb which this extends