Fix discipline update and list