Revert some flags and fix asserts