Improve libstd++ handling