CS fixes
Fixed type hinting