Some minor fixes for new installations.