some fixes

Change-Id: I7b8d061eacfe2ec97ff9b0c7cf603e442b4a9f9c
Signed-off-by: Grarak <williye97@gmail.com>