Ticket #3505 clean Werrors