Even more fixes !