Trying more fixes