Compilation fixes up to the point where code broke in a way which reminded me that that was where I was last working.