Patched 6809 Client ROM to fix a couple of bugs I found

Change-Id: I441ba84af3dfe2900bd1bc3eecfa86b5062383bb