Attempt more fixes