Fixed others (23/33)

Fixed others