Minor modifications in some scripts