Some new fixes