Upgrade to latest Haikro