Fix signature and doctags