Adding some fixes
Adding some fixes