Fixed some stuff

Change-Id: I44ae6e387c8e6700320753070ac956c52906dc47