Fixes errors and removes notifications to all and where