Small fixes
Fixed #91