Tested fixes for alpha release to testing