Fix to BoK usage with serenity checks
This should help resolve overuse of BoK in ST rotations