Fixing a few issues around suspending/resuming