Changes to compile with latest version of haggerston...