#94 - Fixed client upgrade errors