Add fixes for PluckStruct