a few fixes