Added tested fixes