Fixes for fresh install related issues