more CompoundButton fixes

s/Button/CompoundButton/