Minor service handler changes.