Replace warnings with TODO comments