Bufixes and small changes