Small changes to handle empty file startups...