some bufixes