Adding more hardening to develop build.

Also fixed some flag inconsistency.