a few fixes for previous push