Even more fixes!