Fix after code review, type hinting specs \o/