Small fixes

small fixes