more fixes

Change-Id: I3e7b4f1781921b6316011a4f4480722d23c1d067
Signed-off-by: klozz <xxx.reptar.rawrr.xxx@gmail.com>