A few tweaks to make Flux more friendly on startup