Working bugs out