Changes for winch - mainly JSON parsing fixes.