Fix calls to not include self