Fixes to ensure save to folders/files work if folders exist already