Minor fixes and clean-up for KeystoneStrategy