Update pushfix to encompass more situations