Spytz metadata model bug fixes