Couple of bug fixes and tunings for TOAS 3.0