Possible format string related improvements