diff --git a/osgi-bundles/bundles/analytics/src/main/resources/com/ning/billing/osgi/bundles/analytics/dao/BusinessAnalyticsSqlDao.sql.stg b/osgi-bundles/bundles/analytics/src/main/resources/com/ning/billing/osgi/bundles/analytics/dao/BusinessAnalyticsSqlDao.sql.stg
index df81b81..7f5b6dd 100644
--- a/osgi-bundles/bundles/analytics/src/main/resources/com/ning/billing/osgi/bundles/analytics/dao/BusinessAnalyticsSqlDao.sql.stg
+++ b/osgi-bundles/bundles/analytics/src/main/resources/com/ning/billing/osgi/bundles/analytics/dao/BusinessAnalyticsSqlDao.sql.stg
@@ -924,8 +924,8 @@ where <CHECK_TENANT_AND_ACCOUNT("t.")>
>>
deleteByAccountRecordId(tableName) ::= <<
-delete from <tableName> t
-where <CHECK_TENANT_AND_ACCOUNT("t.")>
+delete from <tableName>
+where <CHECK_TENANT_AND_ACCOUNT("")>
;
>>
diff --git a/osgi-bundles/bundles/analytics/src/main/resources/com/ning/billing/osgi/bundles/analytics/ddl.sql b/osgi-bundles/bundles/analytics/src/main/resources/com/ning/billing/osgi/bundles/analytics/ddl.sql
index 82f8d01..f20b09e 100644
--- a/osgi-bundles/bundles/analytics/src/main/resources/com/ning/billing/osgi/bundles/analytics/ddl.sql
+++ b/osgi-bundles/bundles/analytics/src/main/resources/com/ning/billing/osgi/bundles/analytics/ddl.sql
@@ -76,7 +76,7 @@ create table bac (
, notified_for_invoices boolean not null
, balance numeric(10, 4) default 0
, last_invoice_date date default null
-, last_payment_date datetime not null
+, last_payment_date datetime default null
, last_payment_status varchar(255) default null
, created_date datetime not null
, created_by varchar(50) not null
