Add std option regardless of compiler
Sync with libnpa