Supressed some warnings from latest lint version