Fixes with alerts