Even more fixes