Fixed others (15/33)

Fixed others