Various updates to make it work again.