Fix comments and alerts