Fix serviceState type conflict