Minor fixes from testing
Minor Changes from testing