Pull from Askarn

Fixes machine construction