Fix types. Add setters.