Fix setting commands