Remove unneeded user macro
Fix some compiler warnings regarding safe string methods on MSC