Some puffer fixes