A few more fixes; compiles on ignatius