Misc patches and blank keys

Bump