Some small fixes
Small changes again..