Maua client fix and improvements