Minor changes

Bug fixes with create file option