Down to 1 current error

Change-Id: I0b25a2c686cfd8a7101d54ba9ab466813caa072d