multiple puppet fixes