Update to 3.5.8.2

Fixes some bugs

Signed-off-by: Elliot Condon <e@elliotcondon.com>