some small fixes
some small fixes