Update against STRICT STANDARDS