Fix arg and retuen types