Make a few things flags.
Async fixes