Fix Client handlers being optional
Update Flay config