Revert last workque change as not needed
improve build flags