Various bufixes.