Some bugs resolve