Fix setting of defaults