Some new fixes!