Small fixes
Changed some default values