miscellaneous changes

Minor changes done