Fix bugs, change cancellable semantics, etc