Fixes and logging for grace mode.