kmsdispatcher: Small fixes

Change-Id: Ie01b7e9375a0c0096801a7fce950c8f0f033ce65