minor bufixes