Fixes key store includes