Some bugs, typehints