String fixes and add building without keyfiles.