Various bufixes