A few new fixes