Adding some other changes and fixes