Bug fixes for credential harvester