Minor Changes And Fixes