incorporate more postcompo changes