Fixes to recent issues