Fixed buggy/intermittent keyfile and passwd options.