small fixes for fresh system run