Fix sourcing defaults and checking for file