Make Riking's stuff work