Minor improvements, mostly to the pre/post-rm