Small fixes for CI

Change-Id: I40ba20c6d0a4b15057a505e3f6d8dacd29b66721