Lot more fixes