Some changes to reduce errors during initial setup on linux