Slight modifications to superloc

Change-Id: Ic5e9c40977baea1918f09729cbb98d393f9e24d8