A few fixes for fresh installs