More pause fixes