Update for m7, fix more timestamps