Remove warning problems