Modes and keys files minor modifications