Adds some fixes