A more fixes