Minor fixes for first run on new installation