Post testing hotfixes