Based on post, fixing some postrm issues