Fixed recent changes, now compilable.