Change Aero to use char16_t