Fix basic handler return values