Additional fixes for json handling