Fixes for senate class, nickname, and district for senators