Minor changes to some scripts