Fix missing cmd in user command list
Move shutdown handle in own method