Last few resume fixes for now