Changed types in config structs, reverted last commit (unix)