some fixes for normal service type