Use faces for key display (saves space)
Fix compile issues