a few fixes
a few fixes