Fixes for strikeout