Small bufixes