Misc patches and blank keys