Issue fix, Suppressed warnings