Small fixes

+ small fixes