Fix key generation full/partial