Fixed #707
Fixed #701
Fixed #706
Fixed #687