bug fixes merged from Twidere