Fixes for compatibility with Strike