Add more fixes!