work in progress on better post-install fix support