Fixing bugs in infrastructure