Bug fixes take two