Fixed some inconsistencies with default values.