Attempted more rook fixes