Update defaults with correct values