Fix up tabs and add self to some calls