Ignore implicit classes during the fixup
Use time scale during NA padding