Updated for the newer version, and made sure compilation works throughout.