Yes and yes.  If you're using canned peach slices, be sure to drain them well.  Then, cut them into small pieces and pat dry before adding to the filling mixture.  If you use frozen, let the thaw completely first.  Then drain, dice and pat dry.