Build fixes and json fixes.