Fix some json stuff