diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/config/xml/CassandraSessionParser.java b/spring-cassandra/src/main/java/org/springframework/cassandra/config/xml/CassandraSessionParser.java
index 9a34ce24f..9fe351d96 100644
--- a/spring-cassandra/src/main/java/org/springframework/cassandra/config/xml/CassandraSessionParser.java
+++ b/spring-cassandra/src/main/java/org/springframework/cassandra/config/xml/CassandraSessionParser.java
@@ -56,8 +56,8 @@ protected void doParse(Element element, ParserContext parserContext, BeanDefinit
 
 		parseKeyspaceName(element, builder);
 		parseClusterRef(element, builder);
-		parseScripts(element, builder, "startup-cql", "startupScript");
-		parseScripts(element, builder, "shutdown-cql", "shutdownScript");
+		parseScripts(element, builder, "startup-cql", "startupScripts");
+		parseScripts(element, builder, "shutdown-cql", "shutdownScripts");
 	}
 
 	protected void parseScripts(Element element, BeanDefinitionBuilder builder, String elementName, String propertyName) {
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/TableMapping.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/TableMapping.java
index 821a705c1..9f6424a12 100644
--- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/TableMapping.java
+++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/mapping/TableMapping.java
@@ -2,8 +2,6 @@
 
 import java.util.Set;
 
-import javax.validation.constraints.NotNull;
-
 /**
  * Interface that stores information about the mapping between a table and the entity or the entities that are mapped to
  * it.
@@ -17,7 +15,6 @@ public interface TableMapping {
 	 * knows that there is only one entity class in this mapping. If there are multiple and this method is called, an
 	 * {@link IllegalStateException} is thrown.
 	 */
-	@NotNull
 	Class<?> getEntityClass();
 
 	/**
@@ -25,7 +22,7 @@ public interface TableMapping {
 	 * 
 	 * @param entityClass The class; may not be null.
 	 */
-	void setEntityClass(@NotNull Class<?> entityClass);
+	void setEntityClass(Class<?> entityClass);
 
 	/**
 	 * Sets the set of entity classes of this mapping.
@@ -35,17 +32,15 @@ public interface TableMapping {
 	/**
 	 * Returns the set of entity classes of this mapping. Never returns null.
 	 */
-	@NotNull
 	Set<Class<?>> getEntityClasses();
 
 	/**
 	 * Returns the name of this mapping. Never returns null.
 	 */
-	@NotNull
 	String getTableName();
 
 	/**
 	 * Sets the table name of this mapping.
 	 */
-	void setTableName(@NotNull String tableName);
+	void setTableName(String tableName);
 }