adjust fetches

Change-Id: Ie3b8394fd1eefa9dfe8670a1c8f3ede4d176fd22