Minor fixes to get the code in a working state again.