More post-estimation improvements