Made some fixes

Made some fixes