After fixing warnings