Fixing typo. Adding additional hotfixes.