1.6 ~ zero pinner ~ resume fixes