diff --git a/src/adql/parser/ADQLQueryFactory.java b/src/adql/parser/ADQLQueryFactory.java
index e10931e422cbd616808b3a18b5e402f2f225432a..b4fce00ac88c868854fc5f06886ba37bf1e693c9 100644
--- a/src/adql/parser/ADQLQueryFactory.java
+++ b/src/adql/parser/ADQLQueryFactory.java
@@ -411,7 +411,7 @@ public class ADQLQueryFactory {
 	}
 
 	/**
-	 * @deprecated since 1.4 ; Former version's mistake: an ORDER BY item is either a regular/delimited column name or an integer, not a qualified column name ; Replaced by {@link #createOrder(Identifier, boolean)} ; This function is no longer used by ADQLParser. 
+	 * @deprecated since 1.4 ; Former version's mistake: an ORDER BY item is either a regular/delimited column name or an integer, not a qualified column name ; Replaced by {@link #createOrder(IdentifierItem, boolean)} ; This function is no longer used by ADQLParser. 
 	 */
 	@Deprecated
 	public ADQLOrder createOrder(final IdentifierItems idItems, final boolean desc) throws Exception{
@@ -431,7 +431,7 @@ public class ADQLQueryFactory {
 	}
 
 	/**
-	 * @deprecated since 1.4 ; Former version's mistake: a GROUP BY item is either a regular/delimited column name or an integer, not a qualified column name ; Replaced by {@link #createColRef(Identifier)} ; This function is no longer used by ADQLParser.
+	 * @deprecated since 1.4 ; Former version's mistake: a GROUP BY item is either a regular/delimited column name or an integer, not a qualified column name ; Replaced by {@link #createColRef(IdentifierItem)} ; This function is no longer used by ADQLParser.
 	 */
 	@Deprecated
 	public ColumnReference createColRef(final IdentifierItems idItems) throws Exception{
diff --git a/src/adql/query/ADQLList.java b/src/adql/query/ADQLList.java
index 2ffdaee06d4c6305c100cbdf76006c28d9c4d5cd..050fae68601648c82d0374b42caf78fce7a9e81a 100644
--- a/src/adql/query/ADQLList.java
+++ b/src/adql/query/ADQLList.java
@@ -195,7 +195,7 @@ public abstract class ADQLList< T extends ADQLObject > implements ADQLObject, It
 	/**
 	 * Sets the position at which this {@link ADQLList} has been found in the original ADQL query string.
 	 * 
-	 * @param pos	Position of this {@link ADQLList}.
+	 * @param position	Position of this {@link ADQLList}.
 	 * @since 1.4
 	 */
 	public final void setPosition(final TextPosition position){
diff --git a/src/adql/query/operand/NegativeOperand.java b/src/adql/query/operand/NegativeOperand.java
index 7b4bc5901867a65e6e4a0a92f355f15617dffeda..a524aaeef0102935a8f2d54a78192984e373d2c5 100644
--- a/src/adql/query/operand/NegativeOperand.java
+++ b/src/adql/query/operand/NegativeOperand.java
@@ -93,7 +93,7 @@ public final class NegativeOperand implements ADQLOperand {
 	/**
 	 * Sets the position at which this {@link NegativeOperand} has been found in the original ADQL query string.
 	 * 
-	 * @param pos	Position of this {@link NegativeOperand}.
+	 * @param position	Position of this {@link NegativeOperand}.
 	 * @since 1.4
 	 */
 	public final void setPosition(final TextPosition position){
diff --git a/src/adql/query/operand/NumericConstant.java b/src/adql/query/operand/NumericConstant.java
index 53e4937cf1f7bbff1a48c3939d6c4a7e3ad1c0a8..edd39b9a8cf1da49b0f4a01661991369982179a1 100644
--- a/src/adql/query/operand/NumericConstant.java
+++ b/src/adql/query/operand/NumericConstant.java
@@ -176,7 +176,7 @@ public final class NumericConstant implements ADQLOperand {
 	/**
 	 * Sets the position at which this {@link NumericConstant} has been found in the original ADQL query string.
 	 * 
-	 * @param pos	Position of this {@link NumericConstant}.
+	 * @param position	Position of this {@link NumericConstant}.
 	 * @since 1.4
 	 */
 	public final void setPosition(final TextPosition position){
diff --git a/src/adql/query/operand/Operation.java b/src/adql/query/operand/Operation.java
index 1418ae1cce1ea4784c4ba47c3d2e2255018d06fa..f8a0a735101e8960f11a888a812dd23d3309f769 100644
--- a/src/adql/query/operand/Operation.java
+++ b/src/adql/query/operand/Operation.java
@@ -194,7 +194,7 @@ public class Operation implements ADQLOperand {
 	/**
 	 * Sets the position at which this {@link WrappedOperand} has been found in the original ADQL query string.
 	 * 
-	 * @param pos	Position of this {@link WrappedOperand}.
+	 * @param position	Position of this {@link WrappedOperand}.
 	 * @since 1.4
 	 */
 	public final void setPosition(final TextPosition position){
diff --git a/src/adql/query/operand/StringConstant.java b/src/adql/query/operand/StringConstant.java
index 998bda9057ee2e1d85d6202dfd9f8e14ff2fe458..a01ccdfb1d930f1dceb116fa447f904dfc21bc9f 100644
--- a/src/adql/query/operand/StringConstant.java
+++ b/src/adql/query/operand/StringConstant.java
@@ -73,7 +73,7 @@ public final class StringConstant implements ADQLOperand {
 	/**
 	 * Sets the position at which this {@link StringConstant} has been found in the original ADQL query string.
 	 * 
-	 * @param pos	Position of this {@link StringConstant}.
+	 * @param position	Position of this {@link StringConstant}.
 	 * @since 1.4
 	 */
 	public final void setPosition(final TextPosition position){
diff --git a/src/adql/query/operand/WrappedOperand.java b/src/adql/query/operand/WrappedOperand.java
index ca36d7a03793796702ddd36c38aaa9e843751c47..ff90fe1b9978053b5b6de8ad5e2fac6ecda46a00 100644
--- a/src/adql/query/operand/WrappedOperand.java
+++ b/src/adql/query/operand/WrappedOperand.java
@@ -80,7 +80,7 @@ public class WrappedOperand implements ADQLOperand {
 	/**
 	 * Sets the position at which this {@link WrappedOperand} has been found in the original ADQL query string.
 	 * 
-	 * @param pos	Position of this {@link WrappedOperand}.
+	 * @param position	Position of this {@link WrappedOperand}.
 	 * @since 1.4
 	 */
 	public final void setPosition(final TextPosition position){
diff --git a/src/tap/ADQLExecutor.java b/src/tap/ADQLExecutor.java
index 841e023090afa134b58f7ff194b6fe598c6b56bc..a48e7af970f4802d71b05a9e94f71c0c570b0679 100644
--- a/src/tap/ADQLExecutor.java
+++ b/src/tap/ADQLExecutor.java
@@ -676,7 +676,7 @@ public class ADQLExecutor {
 
 			}catch(IOException ioe){
 				// Propagate the exception:
-				throw new UWSException(UWSException.INTERNAL_SERVER_ERROR, ioe, "Impossible to write in the file into the result of the job " + report.jobID + " must be written!");
+				throw new UWSException(UWSException.INTERNAL_SERVER_ERROR, ioe, "Impossible to write in the file into which the result of the job " + report.jobID + " must be written!");
 			}finally{
 				if (!completed){
 					// Delete the result file (it is either incomplete or incorrect ;