Improve 'safe-mode' list.