Fix errors hopefully

Change-Id: I8ff906a7b819f7629609e6b6cabef364f19e5b61