from/JSON bugfixes