Fixed some defaults