A few changes to account for absence of some scripts on some machines