Fixes to remove errors reported by eclipse validator