Some updates to fix bugs and get things building again.