diff --git a/awsapi/resource/AmazonEC2/services.xml b/awsapi/resource/AmazonEC2/services.xml
index bc494aba0e9..027aa1881a4 100644
--- a/awsapi/resource/AmazonEC2/services.xml
+++ b/awsapi/resource/AmazonEC2/services.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+ -->
 <!-- This file was auto-generated from WSDL -->
 <!-- by the Apache Axis2 version: 1.5.6  Built on : Aug 30, 2011 (10:00:16 CEST) -->
 <serviceGroup>
diff --git a/awsapi/src/com/amazon/ec2/client/AmazonEC2CallbackHandler.java b/awsapi/src/com/amazon/ec2/client/AmazonEC2CallbackHandler.java
index 8b200bda122..13ca70be8d4 100644
--- a/awsapi/src/com/amazon/ec2/client/AmazonEC2CallbackHandler.java
+++ b/awsapi/src/com/amazon/ec2/client/AmazonEC2CallbackHandler.java
@@ -1,3 +1,19 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 
 /**
  * AmazonEC2CallbackHandler.java
@@ -32,7 +48,7 @@
     * Please use this constructor if you don't want to set any clientData
     */
     public AmazonEC2CallbackHandler(){
-        this.clientData = null;
+        clientData = null;
     }
 
     /**