fix maintenance scripts

Change-Id: I24e17659232aeada19a6a6af77eaebf03861756b