small fixes

Small fixes