Fixing various silly bugs related to key stores
Version 0.4.13