Kees fixed 013A FIGHTER to use keys; Dave fixed HIRES

Change-Id: I4a6186ca2413abd40378c4a4fc4ffcb35c68a876