Minor prepare changes