Attempted more fixes