Fix typo
Fix logic and service call errors