Adding some fixes