Fixed some issues that got reintroduced when working on our building the CellML API.