Fix soft keys and compile errors.

Change-Id: I46f94d670b1173dfc1f37d58619d966881571476