Changes/Hotfixes for flavors pages