Fixes checks for address and service options