Some changes to Basic preprocessing tools