Fix all of MOA_Client