EMBRYO-68: various fixed to minimize JSON and solve
NullPointerExceptions etc.