Fixes for Stroop