make a few fixes