Build: Try to fix loops

Change-Id: Iee414103c0acaec94d1414b47564a98ed5558a94