more gracetime fixes