More polish around sidekiq support