Fix dependencies; fix request counter