Another big round of bugs