Some minor changes to Make
Force flush