Some new fixes...