Setting action fixes