Update the files in fuel-plugin to match the upstream