Fixes for shift_word().