Fix actually setting defaults