Fixes and conditions update