Move to 4.6, fix flags.