Fixed some default falues