Fixed another issue with ExtractTiming and cleared compile errors for HKPG and Ephm