Don't display 0 and fix keys