Updates after testing on fresh install