small modifications to get running with 'rungotchi'