various bufixes