All possible warnings resolved