Fixes for January 15