Fix some endorses controller issues