Fixes for Blitz