Fixes to make to module work again.