Fixed crash, removed oTD, PAA fixes