FIXED all warnings