Bufixes after Alex's review