Done some fixes